peter/20260524_add_chicken_katsu_recipe#395
Conversation
petermle
commented
May 25, 2026
|
@evanugarte please review! |
|
this pr is adding 8 files, when it really should just be a new html file and the corresponding line in index.html see the below youtube video on the sce youtube page for how to check the pr's "files changed" tab if its not clear how to delete the random files, check this other sce video on how to "start over" on a pr |
|
done! |
|
theres still a merge conflict, visible at the bottom of the page of this pr, we have 2 ways to get around it
if you follow the video, be sure to pull changes from the main branch of the sce repo, which is different from the main branch of your fork |
|
yep, should be free of merge conflicts now! |
|
i likely messed your pr up, i merged another, how did you fix the conflicts, was it through the browser? |
|
yes, through browser! i got rid of the merge conflicts through browser again if that helps. let me know if i need to do anything differently! |
|
winner |